Fix after-string and image interaction bug (Bug#1336).

* xdisp.c (next_element_from_image): Ensure that after-strings are
read the next time we hit handle_stop (Bug#1336).

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c72a78f076f7fcca7f2a1507e57926e1660c769..e06d4c41363e55844e92f4ff063d2e430382ab25 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-25  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xdisp.c (next_element_from_image): Ensure that after-strings are
+       read the next time we hit handle_stop (Bug#1336).
+
 2010-06-23  Andreas Schwab  <schwab@linux-m68k.org>
 
        * lread.c (read1): Signal error if #s is not followed by paren.

diff --git a/src/xdisp.c b/src/xdisp.c
index 7dcdf19431a62ec7a3f42c9a7bc92c6fb55d1d55..73ed675c4d23cc0842f9646b7fdb61d7e2a6e2cb 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -6429,6 +6429,7 @@ next_element_from_image (it)
      struct it *it;
 {
   it->what = IT_IMAGE;
+  it->ignore_overlay_strings_at_pos_p = 0;
   return 1;
 }